reverted some of my erratical changes
member tests slightly cleaned up