Fixes for older collection format and env vars in tests

Fixes for #79 and #85. Version incremented for release.