(#1973) - made stricter tests