pip test fixup and module cleanup