fixed test
optimized test performance