Homec4science

rAKA/bugfixes%2Fgoogle-test-ref-changed
9a7c04e6e28cfeatures/solver-rewrite