@benjyw as this is code only used by you, that's your call on tests- we might accidentally break it without them of course.  Otherwise, this is fine to be merged.