add toggle force flag and update tests