windows build works again, gtest/mock cleanup

wait for travis, then free to merge.