MOB-167 Fixed some tests