Update tests and api