Fixed location tracking, fixed some parser tests