Merge "remove cron trigger from main feature test"