Fix much stupidity with tests.