added file service to test suite, fixed null entity serialization