[#53350783] Unit tests and small cleanup items.