more tests written
merge conflicts