Tightening the tests