Corrected base for tests. Exceptions moved to client, though I'm still getting unmarshalling errors.