Add the Api tests, move settings tests to API tests