Move CORS to BaseHandler
Working on tests