Enable CORS
Remove comments and update tests