SGF-146 - improved test performance