Rearranged tests and imports, pushed up branch test coverage