Controller and additional unit tests