Merge pull request #4 from geertweening/update-tests

Update controllers and tests for new gateway-data api