add in rest of controllers and tests