more tests rules certain scenarios that might be causing enquiry criteria bug