Fixed glitches, add test beat