clean-ups, unit tests