```reset_connection``` used here is only good for two of the tests. I've looked into refactoring the tests but do you think it should be done in this pull request?