follow up to c4dd8d9e, fix slop and add test