member class
main commit
fixed tests