Fixed broken methods and tests due to refactoring.