More unit tests API updates