++expecta with changes from petejkim/master