hammer tests: fix, reworks. ready to go. round2.