Removed test data holder classes. Changed the way parameters are handled
by the tests.
Removed unneeded assumptions from tests.
Style fixes on the tests.
Made the test methods final.