Changed test suite to test function.
Another rewrite of test suite.