Allow explicit endpoint declaration for tests
Merge branch 'endpoint-shorthand' into develop