chore(tests): bring brevity to tests, change error handling