Also some refactoring to make this easier in the future, steps towards
unifying production and testing definitions, and start of docs for the whole thing.