remove comments
comments
more tests for better coverity