Synchronize VS2013 build with VS2012.
Remove unnecessary unittest assembly reference.
Add missing defines.