Reorganize tests
Reorganize reporting tests
Refactor execute() for readability and remove code duplication