Testing

Tests now match API changes.