Cleaning up options, counting errors in failure test