Add new tests, endpoint map