Flesh out coverage, fix failing integration test