some cleanup / renames / extractions
add file/line numbers to failures