Fix all the easy things to fix - 11 tests now pass