finished controller tests, cleaned up a few areas
Merge branch 'develop' into feature/processingQueue