Fix/tests

ongoing pull, till it passes.