Fix some imports of module moved to Data.Logic.HUnit