Fix monoticity decomposition
Fix test compilation