MOB-277 

 Added more tests for critical functionality and for upping the coverage.