Bugfix for cli tool and resource pathing.

Resolves #64 and updates tests according to resolve CLI tool resource
pathing to match swagger doc requirements.