MOB-1356, add tests