Improved simple checks and the unit tests
improve PC-Lint unit test