Tightening up tests.