consolidated unit tests by Yogesh and Kumaran