Fixed tests to reflect the refactorization.