Expand testing of API classes