update FakerContext and write supporting tests