Remove default values used during testing