Fix minor issue with id incrementing logic
Use clearer variable name, cleanup in tests