Fix gunit tests