Removes usage of `CommonTest` that are not required.
Also canonicalize the import paths. This should help
to speed up the tests slightly by reducing the amount
of execution required to run the tests.