Started relaying the tests to the refactored situation.