fixed tests (all succeed) and cleaned up stray code.