resource pool tests
fix merge conflict
Merge pull request #80 from daniellemayne/develop

resource pool support