Advanced parsing / error corrections
Added automatic testing