Implemented filter to only fetch a single entity type, to help reproduce #1
Added frame for test-command, it will help to setup a scrambled test database