Fix couple of errors in testing.