simplifies filenames in tests
increases buster timeout