Merge "Fix service tests." into lmp-dev