Add: started to write a few tests for the API