Feature/club 996 fix tests