Feature/club 996 fix tests

This looks big because I'm deleting two apps. Maybe best review the separate commits.