Test framework improvements:
* Expression line is now displayed

Assert framework improvements:
* Added macros to force asserts on or off