Updates Propagation tests + bug fixes