Updated to reflect refactored unit tests.