Corrected regression from last refactoring

Left some test code in from my last refactore...