Updated Tests with new API usage.