Updates to Test2

Still trying to make the conceptual leap I need to make, but the
patterns do match now.