Test fix and imports