fixup unittests to reflect separation of underlying args