Fix Remaining Tests (Sample Apps and Plugins)