Fix system test problems with Chosen