Testing gone wild
Added more tests