more tests and halfway through plumbing