Removed all testing for now.  Will work on this in separate branch.