Fixed CORS issue with tests, 2 outstanding issues