more house cleaning:

  * directly referencing constants
  * smaller spock test blocks where possible