Adding CORS and extending testing