Performance improvements for project tests