Testing

Tests now match API changes.
It helps a lot. Thanks.