Revert some changes to setup and manifest. Add test.crt and test.key