Added additional error checking for Export Service.
Revised test to contain smaller entities written for test.