Clean up tests and a little lintine
Fix linting errors

This commit fixes linting errors across the manifests.