diff --git a/applications/test/PackedList/PackedListTest.C b/applications/test/PackedList/PackedListTest.C
index 05f3a077f8..0c8528bd1c 100644
--- a/applications/test/PackedList/PackedListTest.C
+++ b/applications/test/PackedList/PackedListTest.C
@@ -28,8 +28,11 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
+#include "argList.H"
 #include "uLabel.H"
+#include "IOobject.H"
 #include "IOstreams.H"
+#include "IFstream.H"
 #include "PackedBoolList.H"
 
 using namespace Foam;
@@ -39,309 +42,54 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    Info<< "PackedList max_bits() = " << PackedList<>::max_bits() << nl;
+    argList::noParallel();
+    argList::validArgs.insert("file .. fileN");
 
-    Info<< "\ntest allocation with value\n";
-    PackedList<3> list1(5,1);
-    list1.print(Info);
+    argList::validOptions.insert("count", "");
+    argList::validOptions.insert("info", "");
 
-    Info<< "\ntest assign uniform value\n";
-    list1 = 3;
-    list1.print(Info);
+    argList args(argc, argv, false, true);
 
-    Info<< "\ntest assign uniform value (with overflow)\n";
-    list1 = -1;
-    list1.print(Info);
-
-    Info<< "\ntest zero\n";
-    list1 = 0;
-    list1.print(Info);
-
-    Info<< "\ntest set() with default argument (max_value)\n";
-    list1.set(3);
-    list1.print(Info);
-
-    Info<< "\ntest assign between references\n";
-    list1[2] = 3;
-    list1[4] = list1[2];
-    list1.print(Info);
-
-    Info<< "\ntest assign between references, with chaining\n";
-    list1[0] = list1[4] = 1;
-    list1.print(Info);
-
-    Info<< "\ntest assign between references, with chaining and auto-vivify\n";
-    list1[1] = list1[8] = list1[10] = list1[14] = 2;
-    list1.print(Info);
-
-
-    Info<< "\ntest operator== between references\n";
-    if (list1[1] == list1[8])
+    if (args.additionalArgs().empty())
     {
-        Info<< "[1] == [8] (expected)\n";
-    }
-    else
-    {
-        Info<< "[1] != [8] (unexpected)\n";
+        args.printUsage();
     }
 
-    if (list1[0] != list1[1])
+    forAll(args.additionalArgs(), argI)
     {
-        Info<< "[0] != [1] (expected)\n";
+        const string& srcFile = args.additionalArgs()[argI];
+        Info<< nl << "reading " << srcFile << nl;
+
+        IFstream ifs(srcFile);
+        List<label> rawLst(ifs);
+        PackedBoolList packLst(rawLst);
+
+        Info<< "size: " << packLst.size() << nl;
+
+        if (args.optionFound("count"))
+        {
+            unsigned int rawCount = 0;
+            forAll(rawLst, elemI)
+            {
+                if (rawLst[elemI])
+                {                    
+                    rawCount++;
+                }                
+            }
+            Info<< "raw count: " << rawCount << nl            
+                << "packed count: " << packLst.count() << nl;
+        }
+
+        if (args.optionFound("info"))
+        {
+            packLst.print(Info);
+        }
+        
+        Info<< nl;
+        IOobject::writeDivider(Info);
     }
-    else
-    {
-        Info<< "[0] == [1] (unexpected)\n";
-    }
-
-    Info<< "\ntest operator== with iterator\n";
-    {
-        PackedList<3>::iterator iter = list1[1];
-
-        if (iter != list1[8])
-        {
-            Info<< "iter != [8] (expected)\n";
-        }
-        else
-        {
-            Info<< "iter == [8] (unexpected)\n";
-        }
-
-        if (*iter != list1[8])
-        {
-            Info<< "*iter != [8] (unexpected)\n";
-        }
-        else
-        {
-            Info<< "*iter == [8] (expected)\n";
-        }
-    }
-
-
-    {
-        const PackedList<3>& constLst = list1;
-        Info<< "\ntest operator[] const with out-of-range index\n";
-        constLst.print(Info);
-        if (constLst[20])
-        {
-            Info<< "[20] is true (unexpected)\n";
-        }
-        else
-        {
-            Info<< "[20] is false (expected) list size should be unchanged (const)\n";
-        }
-        constLst.print(Info);
-
-        Info<< "\ntest operator[] non-const with out-of-range index\n";
-        if (list1[20])
-        {
-            Info<< "[20] is true (unexpected)\n";
-        }
-        else
-        {
-            Info<< "[20] is false (expected) but list was resized?? (non-const)\n";
-        }
-        list1.print(Info);
-    }
-
-
-    Info<< "\ntest operator[] with out-of-range index\n";
-    if (!list1[20])
-    {
-        Info<< "[20] is false, as expected\n";
-    }
-    list1.print(Info);
-
-    Info<< "\ntest resize with value (without reallocation)\n";
-    list1.resize(8, list1.max_value());
-    list1.print(Info);
-
-    Info<< "\ntest flip() function\n";
-    list1.flip();
-    list1.print(Info);
-
-    Info<< "\nre-flip()\n";
-    list1.flip();
-    list1.print(Info);
-
-    Info<< "\ntest set() function\n";
-    list1.set(1, 5);
-    list1.print(Info);
-
-    Info<< "\ntest assign bool\n";
-    list1 = false;
-    list1.print(Info);
-
-    Info<< "\ntest assign bool\n";
-    list1 = true;
-    list1.print(Info);
-
-    Info<< "\ntest resize without value (with reallocation)\n";
-    list1.resize(12);
-    list1.print(Info);
-
-    Info<< "\ntest resize with value (with reallocation)\n";
-    list1.resize(25, list1.max_value());
-    list1.print(Info);
-
-    Info<< "\ntest resize smaller (should not touch allocation)\n";
-    list1.resize(8);
-    list1.print(Info);
-
-    Info<< "\ntest append() operation\n";
-    list1.append(2);
-    list1.append(3);
-    list1.append(4);
-    list1.print(Info);
-
-    Info<< "\ntest reserve() operation\n";
-    list1.reserve(32);
-    list1.print(Info);
-
-    Info<< "\ntest shrink() operation\n";
-    list1.shrink();
-    list1.print(Info);
-
-    Info<< "\ntest setCapacity() operation\n";
-    list1.setCapacity(15);
-    list1.print(Info);
-
-    Info<< "\ntest setCapacity() operation\n";
-    list1.setCapacity(100);
-    list1.print(Info);
-
-    Info<< "\ntest operator[] assignment\n";
-    list1[16] = 5;
-    list1.print(Info);
-
-    Info<< "\ntest operator[] assignment with auto-vivify\n";
-    list1[36] = list1.max_value();
-    list1.print(Info);
-
-    Info<< "\ntest setCapacity smaller\n";
-    list1.setCapacity(24);
-    list1.print(Info);
-
-    Info<< "\ntest resize much smaller\n";
-    list1.resize(150);
-    list1.print(Info);
-
-    Info<< "\ntest trim\n";
-    list1.trim();
-    list1.print(Info);
-
-    // add in some misc values
-    list1[31] = 1;
-    list1[32] = 2;
-    list1[33] = 3;
-
-    Info<< "\ntest iterator\n";
-    PackedList<3>::iterator iter = list1.begin();
-    Info<< "begin():";
-    iter.print(Info) << "\n";
-
-    Info<< "iterator:" << iter() << "\n";
-    iter() = 5;
-    iter.print(Info);
-    list1.print(Info);
-
-    iter = list1[31];
-    Info<< "iterator:" << iter() << "\n";
-    iter.print(Info);
-
-
-    Info<< "\ntest get() method\n";
-    Info<< "get(10):" << list1.get(10) << " and list[10]:" << list1[10] << "\n";
-    list1.print(Info);
-
-    Info<< "\ntest iterator indexing\n";
-    Info<< "cend() ";
-    list1.cend().print(Info) << "\n";
-
-    {
-        Info<< "\ntest assignment of iterator\n";
-        list1.print(Info);
-        Info<< "cend()\n";
-        list1.end().print(Info);
-        PackedList<3>::iterator cit = list1[100];
-        Info<< "out-of-range: ";
-        cit.print(Info);
-        cit = list1[15];
-        Info<< "in-range: ";
-        cit.print(Info);
-        Info<< "out-of-range: ";
-        cit = list1[1000];
-        cit.print(Info);
-    }
-
-
-    for
-    (
-        PackedList<3>::iterator cit = list1[30];
-        cit != list1.end();
-        ++cit
-    )
-    {
-        cit.print(Info);
-    }
-
-    Info<< "\ntest operator[] auto-vivify\n";
-    Info<< "size:" << list1.size() << "\n";
-
-    const unsigned int val = list1[45];
-
-    Info<< "list[45]:" << val << "\n";
-    Info<< "size after read:" << list1.size() << "\n";
-
-    list1[45] = list1.max_value();
-    Info<< "size after write:" << list1.size() << "\n";
-    Info<< "list[45]:" << list1[45] << "\n";
-    list1[49] = list1[100];
-    list1.print(Info);
-
-
-    Info<< "\ntest copy constructor + append\n";
-    PackedList<3> list2(list1);
-    list2.append(4);
-    Info<< "source list:\n";
-    list1.print(Info);
-    Info<< "destination list:\n";
-    list2.print(Info);
-
-    Info<< "\ntest pattern that fills all bits\n";
-    PackedList<4> list3(8, 8);
-
-    label pos = list3.size() - 1;
-
-    list3[pos--] = list3.max_value();
-    list3[pos--] = 0;
-    list3[pos--] = list3.max_value();
-    list3.print(Info);
-
-    Info<< "removed final value: " << list3.remove() << endl;
-    list3.print(Info);
-
-
-    List<bool> list4(4, true);
-    {
-        const List<bool>& constLst = list4;
-        Info<< "\ntest operator[] const with out-of-range index\n";
-        Info<< constLst << endl;
-        if (constLst[20])
-        {
-            Info<< "[20] is true (unexpected)\n";
-        }
-        else
-        {
-            Info<< "[20] is false (expected) list size should be unchanged (const)\n";
-        }
-        Info<< constLst << endl;
-    }
-
-    Info<< "\n\nDone.\n";
 
     return 0;
 }
 
-
 // ************************************************************************* //
diff --git a/applications/test/PackedList1/Make/files b/applications/test/PackedList1/Make/files
new file mode 100644
index 0000000000..3d39328952
--- /dev/null
+++ b/applications/test/PackedList1/Make/files
@@ -0,0 +1,3 @@
+PackedListTest1.C
+
+EXE = $(FOAM_USER_APPBIN)/PackedListTest1
diff --git a/applications/test/PackedList1/Make/options b/applications/test/PackedList1/Make/options
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/applications/test/PackedList1/PackedListTest1.C b/applications/test/PackedList1/PackedListTest1.C
new file mode 100644
index 0000000000..05f3a077f8
--- /dev/null
+++ b/applications/test/PackedList1/PackedListTest1.C
@@ -0,0 +1,347 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#include "uLabel.H"
+#include "IOstreams.H"
+#include "PackedBoolList.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    Info<< "PackedList max_bits() = " << PackedList<>::max_bits() << nl;
+
+    Info<< "\ntest allocation with value\n";
+    PackedList<3> list1(5,1);
+    list1.print(Info);
+
+    Info<< "\ntest assign uniform value\n";
+    list1 = 3;
+    list1.print(Info);
+
+    Info<< "\ntest assign uniform value (with overflow)\n";
+    list1 = -1;
+    list1.print(Info);
+
+    Info<< "\ntest zero\n";
+    list1 = 0;
+    list1.print(Info);
+
+    Info<< "\ntest set() with default argument (max_value)\n";
+    list1.set(3);
+    list1.print(Info);
+
+    Info<< "\ntest assign between references\n";
+    list1[2] = 3;
+    list1[4] = list1[2];
+    list1.print(Info);
+
+    Info<< "\ntest assign between references, with chaining\n";
+    list1[0] = list1[4] = 1;
+    list1.print(Info);
+
+    Info<< "\ntest assign between references, with chaining and auto-vivify\n";
+    list1[1] = list1[8] = list1[10] = list1[14] = 2;
+    list1.print(Info);
+
+
+    Info<< "\ntest operator== between references\n";
+    if (list1[1] == list1[8])
+    {
+        Info<< "[1] == [8] (expected)\n";
+    }
+    else
+    {
+        Info<< "[1] != [8] (unexpected)\n";
+    }
+
+    if (list1[0] != list1[1])
+    {
+        Info<< "[0] != [1] (expected)\n";
+    }
+    else
+    {
+        Info<< "[0] == [1] (unexpected)\n";
+    }
+
+    Info<< "\ntest operator== with iterator\n";
+    {
+        PackedList<3>::iterator iter = list1[1];
+
+        if (iter != list1[8])
+        {
+            Info<< "iter != [8] (expected)\n";
+        }
+        else
+        {
+            Info<< "iter == [8] (unexpected)\n";
+        }
+
+        if (*iter != list1[8])
+        {
+            Info<< "*iter != [8] (unexpected)\n";
+        }
+        else
+        {
+            Info<< "*iter == [8] (expected)\n";
+        }
+    }
+
+
+    {
+        const PackedList<3>& constLst = list1;
+        Info<< "\ntest operator[] const with out-of-range index\n";
+        constLst.print(Info);
+        if (constLst[20])
+        {
+            Info<< "[20] is true (unexpected)\n";
+        }
+        else
+        {
+            Info<< "[20] is false (expected) list size should be unchanged (const)\n";
+        }
+        constLst.print(Info);
+
+        Info<< "\ntest operator[] non-const with out-of-range index\n";
+        if (list1[20])
+        {
+            Info<< "[20] is true (unexpected)\n";
+        }
+        else
+        {
+            Info<< "[20] is false (expected) but list was resized?? (non-const)\n";
+        }
+        list1.print(Info);
+    }
+
+
+    Info<< "\ntest operator[] with out-of-range index\n";
+    if (!list1[20])
+    {
+        Info<< "[20] is false, as expected\n";
+    }
+    list1.print(Info);
+
+    Info<< "\ntest resize with value (without reallocation)\n";
+    list1.resize(8, list1.max_value());
+    list1.print(Info);
+
+    Info<< "\ntest flip() function\n";
+    list1.flip();
+    list1.print(Info);
+
+    Info<< "\nre-flip()\n";
+    list1.flip();
+    list1.print(Info);
+
+    Info<< "\ntest set() function\n";
+    list1.set(1, 5);
+    list1.print(Info);
+
+    Info<< "\ntest assign bool\n";
+    list1 = false;
+    list1.print(Info);
+
+    Info<< "\ntest assign bool\n";
+    list1 = true;
+    list1.print(Info);
+
+    Info<< "\ntest resize without value (with reallocation)\n";
+    list1.resize(12);
+    list1.print(Info);
+
+    Info<< "\ntest resize with value (with reallocation)\n";
+    list1.resize(25, list1.max_value());
+    list1.print(Info);
+
+    Info<< "\ntest resize smaller (should not touch allocation)\n";
+    list1.resize(8);
+    list1.print(Info);
+
+    Info<< "\ntest append() operation\n";
+    list1.append(2);
+    list1.append(3);
+    list1.append(4);
+    list1.print(Info);
+
+    Info<< "\ntest reserve() operation\n";
+    list1.reserve(32);
+    list1.print(Info);
+
+    Info<< "\ntest shrink() operation\n";
+    list1.shrink();
+    list1.print(Info);
+
+    Info<< "\ntest setCapacity() operation\n";
+    list1.setCapacity(15);
+    list1.print(Info);
+
+    Info<< "\ntest setCapacity() operation\n";
+    list1.setCapacity(100);
+    list1.print(Info);
+
+    Info<< "\ntest operator[] assignment\n";
+    list1[16] = 5;
+    list1.print(Info);
+
+    Info<< "\ntest operator[] assignment with auto-vivify\n";
+    list1[36] = list1.max_value();
+    list1.print(Info);
+
+    Info<< "\ntest setCapacity smaller\n";
+    list1.setCapacity(24);
+    list1.print(Info);
+
+    Info<< "\ntest resize much smaller\n";
+    list1.resize(150);
+    list1.print(Info);
+
+    Info<< "\ntest trim\n";
+    list1.trim();
+    list1.print(Info);
+
+    // add in some misc values
+    list1[31] = 1;
+    list1[32] = 2;
+    list1[33] = 3;
+
+    Info<< "\ntest iterator\n";
+    PackedList<3>::iterator iter = list1.begin();
+    Info<< "begin():";
+    iter.print(Info) << "\n";
+
+    Info<< "iterator:" << iter() << "\n";
+    iter() = 5;
+    iter.print(Info);
+    list1.print(Info);
+
+    iter = list1[31];
+    Info<< "iterator:" << iter() << "\n";
+    iter.print(Info);
+
+
+    Info<< "\ntest get() method\n";
+    Info<< "get(10):" << list1.get(10) << " and list[10]:" << list1[10] << "\n";
+    list1.print(Info);
+
+    Info<< "\ntest iterator indexing\n";
+    Info<< "cend() ";
+    list1.cend().print(Info) << "\n";
+
+    {
+        Info<< "\ntest assignment of iterator\n";
+        list1.print(Info);
+        Info<< "cend()\n";
+        list1.end().print(Info);
+        PackedList<3>::iterator cit = list1[100];
+        Info<< "out-of-range: ";
+        cit.print(Info);
+        cit = list1[15];
+        Info<< "in-range: ";
+        cit.print(Info);
+        Info<< "out-of-range: ";
+        cit = list1[1000];
+        cit.print(Info);
+    }
+
+
+    for
+    (
+        PackedList<3>::iterator cit = list1[30];
+        cit != list1.end();
+        ++cit
+    )
+    {
+        cit.print(Info);
+    }
+
+    Info<< "\ntest operator[] auto-vivify\n";
+    Info<< "size:" << list1.size() << "\n";
+
+    const unsigned int val = list1[45];
+
+    Info<< "list[45]:" << val << "\n";
+    Info<< "size after read:" << list1.size() << "\n";
+
+    list1[45] = list1.max_value();
+    Info<< "size after write:" << list1.size() << "\n";
+    Info<< "list[45]:" << list1[45] << "\n";
+    list1[49] = list1[100];
+    list1.print(Info);
+
+
+    Info<< "\ntest copy constructor + append\n";
+    PackedList<3> list2(list1);
+    list2.append(4);
+    Info<< "source list:\n";
+    list1.print(Info);
+    Info<< "destination list:\n";
+    list2.print(Info);
+
+    Info<< "\ntest pattern that fills all bits\n";
+    PackedList<4> list3(8, 8);
+
+    label pos = list3.size() - 1;
+
+    list3[pos--] = list3.max_value();
+    list3[pos--] = 0;
+    list3[pos--] = list3.max_value();
+    list3.print(Info);
+
+    Info<< "removed final value: " << list3.remove() << endl;
+    list3.print(Info);
+
+
+    List<bool> list4(4, true);
+    {
+        const List<bool>& constLst = list4;
+        Info<< "\ntest operator[] const with out-of-range index\n";
+        Info<< constLst << endl;
+        if (constLst[20])
+        {
+            Info<< "[20] is true (unexpected)\n";
+        }
+        else
+        {
+            Info<< "[20] is false (expected) list size should be unchanged (const)\n";
+        }
+        Info<< constLst << endl;
+    }
+
+    Info<< "\n\nDone.\n";
+
+    return 0;
+}
+
+
+// ************************************************************************* //