improved test
performance improvements