Add unit tests. Plug another dispose hole in join