Standardize import order
Change logic of selecting the right parser for tests to be more idiomatic