updated tests and controllers to new standard