Increased unit test code cover to 83%