fix unit tests after cleanup