Updated tests to reflect changes in controllers