Add more handler tests