Long overdue fixes to tests

Adjustment to test cases to reflect updates to API
Fixes #8 and #15.