neater handler in test