finalize keystorage test and fixed FieldTest