Using Option for semigroup.
- In turn fixing semigroup test.