-import Data.Maybe (catMaybes, fromJust)
-import Test.HUnit
-import Test.QuickCheck
-
-import qualified Bit as B
-import IPv4Address
-import ListUtils
-import Maskable
-import Maskbits
-import Octet
+import Data.List.Split (splitOneOf)
+import Data.Maybe (catMaybes, mapMaybe)
+
+import Test.Tasty ( TestTree, testGroup )
+import Test.Tasty.HUnit ( (@?=), testCase )
+import Test.Tasty.QuickCheck (
+ Arbitrary(..),
+ Gen,
+ Property,
+ (==>),
+ testProperty )
+import Text.Read (readMaybe)
+
+import qualified Bit as B (Bit(..))
+import IPv4Address (IPv4Address(..), most_sig_bit_different)
+import Maskable (Maskable(..))
+import Maskbits (Maskbits(..))
+import Octet (Octet(..))