Added support for given-when-then syntax