refs #2: Fixed the broken tests.