Added Endpoints and Tests