Feature/subdir tests

Combines:
Closes #22.
Closes #17.

Adds tests for subdirectories also.