Now that we can wait on lines, test can be made a little simpler.