CR changes: refactored unit tests