Better management of tests/refactoring of tests.