-import Data.Maybe (catMaybes, fromJust)
-
-import Test.HUnit (assertEqual)
-import Test.Framework (Test, testGroup)
-import Test.Framework.Providers.HUnit (testCase)
-import Test.Framework.Providers.QuickCheck2 (testProperty)
-import Test.QuickCheck (Arbitrary(..), Gen, Property, (==>))
-
-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( arbitrary ),
+ Gen,
+ Property,
+ (==>),
+ testProperty )
+import Text.Read (readMaybe)
+
+import qualified Bit as B (Bit(..))
+import IPv4Address (
+ IPv4Address( IPv4Address, octet1, octet2, octet3, octet4 ),
+ most_sig_bit_different )
+import Maskable (Maskable(apply_mask))
+import Maskbits ( Maskbits(Zero) )
+import Octet (Octet())