Fixing more tests; almost there