Fixed the tests to work with the new statements.