CLEARWATER: Refactor unit tests for consistency