Made the tests stricter