uncomment tests, more work on fixing conditional tryCatch