BS-11587: write unit test and fix case when there are no Expression
specified