Touched up api tests