Migrate tests to unit or integration
Fix running of fstest
Import missing wrap function
Fix whitespace in test_get_objects.py
Merge pull request #2571 from joshmoore/gateway-tests

Gateway tests