Fancyfy the test directory structure

This will be a requirement for the testing CLI.