Fully refactored tests.