Issue #15: update to tests