Allows options to be injected into the generator/verifier
Various specs cleanups