Moving on
Fix more tests, bad breaking tests

Yet a long way to go