Merge pull request #123 from pmattmann/Unittest/MembershipService

Unittest/membership service
windows fix