Add members class and some tests