Changed tests for simplified API