Started work on property tests re new error handling