Better test assertions

Reviewers: kkamalov, maksims

Reviewed By: maksims

Differential Revision: http://phabricator.locu.com/D5086