Updated VS projectd file
Cleanup
Fixed class name
Updated tests