added missing file and removed unecessary wrapper
added controller tests