fix skipped tests; resolve a warning; progressive tidying
Merge pull request #156 from alleyinteractive/fix-skipped-tests

fix skipped tests; resolve a warning; progressive tidying