Added back sport and keyword tests