adding assertions
Merge branch 'moreSmoke' of https://github.com/shashankg/mark into moreSmoke