Refactoring/Performance tests.