Refactor test system to give me times on calling tests (frankly I still need