Adding test case boilerplate and working on code cleanup.  Not yet stable.