MULE-7468 Remove/migrate service based tests.  Fix failing tests.