Cleanup exceptions. Fix command service tests.