RepeatTest, ForeverTest refactor