Unit test corrections
Metronome fix