Merge pull request #13 from srowen/master

Test fixes