Prevent endpoints from duplicating and silently failing

Fixes confirmed bug from issue #552 with passing rubocop and red/green test. However, there are breaking changes to the existing spec.