Fixes for CDI tests (mac & win)