Fixed a bug with member editing, more tests