Refactored test suite to prepare UI tests.