Added more test and fixed another bug
Added yet another test