Update the tests to cover adding and removing in sub-directories.