Adding more tests and renaming tests