fixing up some scenrios that use examples