Slamhound and minor test cleanup.