Reverting simpleTests changes