Add Bypass for admin and add test server