simplified test output, minor mods in debug lines