misc fixed for test handler