Unused var removed
Added check
Test suite moved to cppunit