better error message
update tests