More test fixing [MJ-480]