Updates and fixes to test and a fix to recent activity