Fix broken tests, add a couple more