Updated local testing suite