Improve assert tool