Cleanup test to use the recommended API