Hotfix/clocksuite#22

Rewrite the clock suite, Issue #22.