Add imports for Java classes used as type hints
Rename deftest's so all names are unique

Identical deftest names mean that the first deftest with the same name
will never have its tests run.