Calling the correct JSON build in the record method
Import reorg
Reorganized the code

I am also no longer specifically recording test runs. They are normal
runs and the fact that they are test runs can be determined later on.