updated controller tests
Merge pull request #9 from nadavmatalon/developer

updated controller tests