Added more scaffolding for tests (tacho count etc.)