Update tests for commit 841745
Basic implementation of 'when' clause