Refactor for declaritive manifests

Completely revamp unit tests