Save now returns the id of the saved entity. Updated functional test to
make use of this and be repeatable.