some unit tests optimizations