Moving tests to a new file and adding tests