Updated tests and using the API sections