Updated tests [MJ-531]