Test classes updated with new API.