Reduce the number of objects created for tests [MJ-369]