More thourough test, fix propagation of glitch