I don't understand why you need to handle these cases separately.  What is different about the acceptance tests that requires you to handle this as a special case?