Add more api tests