chore: minor cleanups, unit tests #901

Closed bdunderscore closed 3 weeks ago