Refactored and reactivated tests.