Issue #7: undid some test code