Updated controllers and tests