Cleanup of Addextra tests and AddGUaranteed test done