Add testing of put/remove of null values