New tests, fix old tests, make more tests work