Continue work implementing integration tests

@jquadrin This fixes the issue you mentioned in PR #2.