Updated public api unit tests