Fix issue # 1

Add new test case for numbers 25,45
Fix 2 existing test cases