More api test coverage