FIX: Changing filenames in tests to reflect new conventions