tweak for expects handling