Modifed TestData per review. Started to add tests for each function