Modified tests to use new test suite