Clean up test file which saves JSON object to file containing all trace variables
Create final tests and directory structure

This is the way all tests will look eventually, we clean out the current
directory structure step by step