Renaming of tests
Improved timer
Cleanup
Improved aggregator