added some more utils and associated tests