fix save handler, update email regexp, fix tests