Split failure into separate test, improve it