Fix issue with double saving a user after setup; also: tests