Fix to test server to properly strip suffix from filenames