Added tests. They all pass
merge conflict