hop, test cleanup

Small tweaks