regenerate and manually fix unit tests