Fixed Unit TestCases as part of coding exercise