Tightened test a bit...