Remove unnecessary json include paths from tests
Consistent use of vendor/environment and include paths
Move exceptions to module RQ
More consistent use of vendor/environment and include paths
Missed an instance of this renamed variable