Fixed tests to make determinate when listening for changes