add fixture with encoded binary addfiles msg and some refactoring