Homec4science

Fix build and test