Issue #73 Update tests