Fix all tests. Project 3 is still incomplete.