Move expectations into success blocks