Fixing annoing bugs within the test.