Finished up unit tests

Got pretty intense trying to test the subradius logic. Refactored a bit along
the way.