Resolve disk store path correctly
Add tests for keys that should return bad request