Add more tests for API