Add support for spec/unit and spec/functional