add more tests for members
resolved conflicts
fixed integration tests