Merge "Spliting member API tests in 2 classes"