refactored tests for v4 API