Time & tests count added, needs code cleanup