Dead code
Extra img tests
Allow for badly formed images