Pipelining tests, and some generic science changes