Change in tests and performance changes