[Finishes #80559928] Completed API with unit tests