Refactored the tests.
Tests refactored.