added some conditionals for wb tests