remove an unneeded field and add more tests