Fix [IMMUTANT-308] and re-org tests to better indicate failure