Improved unit test cases.