Support error logging across keyword handlers and code / test cleanup