Remove given() and replace with if-else [CT]