Refactor benchmark tests and optimisations
Use alternative name for item when collection name cannot be singularized
Comments on demo controllers