Fixed tests and added for class_member