Added more test
Added stuff