Merge pull request #237 from ChristianMurphy/fixing-tests

Fixing Tests
Merge branch 'develop' of https://github.com/Team-H/gateway into fixing-tests