Include more specs
Revert renaming since mocah is not recursive