cleaned up (+++) and added 2 test cases.