Minor code cleanup
Unit and benchmark tests running on VS2013

Run with ctrl+F5 so you can actually look at the console output before
it vanishes.