#JC-1428 Unit testes wete simplified.
#JC-1428 Refactotirng after code review.