Adds controller methods and tests