[#73635408] unit tests and cleanup