wip
better file names
MessageStoreResource + tests