updated adhoc (inline) and default test code, rm unused test methods