Fixed SimpleTest tests.