Improved test speed [MJ-562]