FIX: fixed failing tests and invalid path requires
Merge branches 'Phase-1' and 'Phase-1' of github.com:IMQS/deployment into Phase-1