main
Diff regexp timeout as command line parameter
Structure of tests dir now mimics project structure