Attemped to improve handler tests