Some refactoring of solution. Also added new unit test pattern for warp scan.  Plan to do the same thing for block scan and others