updated tests and factories MJ-525