Fix unittest runners