added more endpoints.  Refactor tests.