Installation order fixes (and testing bypasses)