Renamed Key into Name and added more tests