Merge pull request #4 from loosebazooka/fixTests automerge: f86be40
automerge: 789eab7

* commit '789eab79e9c625b99be1180d8ceabdd484e91edf':
  Fix tests for new test path