Fixed endpoint conflict
Updated tests for #4