Clean-up specs

* Do not return Factory values that are used internally to build
  a fact (and that change on every invocation)