ticket:2 Solution with updated unit test and karma test results