Fix some obvious problems with tests.