Made testing more robust by adding subdirectories