Add test for no manifest
Remove fallback services, feedback