added support for expect and assert