Modified tests to fail more properly.