Updated version of UnitTest Demo from Spencer Marks