Fixes two more tests. 2 left