Fixed membership issue and tests
Merge pull request #23 from pdarden/tweak_membership

Fixed membership issue and tests