commented out debugging code
some test cleanup