Refactoring of tests.
Removed unused obsolete methods.