updated controllers and tests