Handle database choices and added api_test for api catalogue