Fix all tests, some make more sense, some don't