Refactored bag setup to a single method in tests.
Adding tag files to subdirectories now works.