tightening up tests