Updated performance improvements for tests