some more unit tests optimizations