Fix some unit tests (hopefully)