Fixed couple expression unit test bugs.