Updated test suite for local consumption
Correct all test for local