Untracked parsing files
Fixed merge in test scene