Organize Assert Imports

Also I've changed two test classes to *IT.