Added testing logic and another helping method to allow more testing
information.

Also moved files around to demarcate "product" code versus test code.