updates: code cleanup, unit test update
updates: code cleanup, unit test update