Fixing more tests. Only one left.