Merge "fix no activity tests" into main