Changed name of test files.  These will be managed better in the future.