windows build works again, gtest/mock cleanup
Merge pull request #177 from da2ce7/develop

windows build works again, gtest/mock cleanup