Test updates, Waiters implelmentation