Improve handler test