Renamed files to remove :: characters from the filenames in tests.  Reso...

Renamed files and updated unit test.  Should resolve #1