Correcting violation of fail-fast, and adding new tests