beautifying code, move out some ok() from the expect() calls