Bug fixes; test file renaming