Features testting and refactor controllers