Updated the tests to newer format.