Worked on getting tests to pass