Bunch more tests. With some bug fixes this time!