Extended the integration tests to include the controllers. Also refactored out the common test logic.