Fix munit tests