Fixed compilation unit and migrated to BddDsl.
Still one test failing