Develop

Mostly unit-tests. The change to `glob` was made to make mocking a bit cleaner.