Updates to remove debug left in and to update a couple of test sections
of code.