FORGE-1603: Tests
Merge pull request #440 from mbriskar/FORGE-1603-Tests

FORGE-1603: Tests