Cleanup build grid and include test counts