Better handling of invalid service code
More POST validation tests