Minor changes in advance of code review (uncomment some stuff in testing, deleted some stuff I commented out elsewhere)