Manipulate internal state internally.  Also correctly.  This fixes the last two failing tests.
Manipulate internal state internally.  Also correctly.  This fixes the last two failing tests.

mbrukman/flocker,mbrukman/flocker,mbrukman/flocker