Some of the test cases were failing due to the busted (relative) import.

This fixes some of the failures, but there are still more.