COOPR-583: Refactored Unit tests.