Slight rename
Added more tests