adding more tests, renaming file.