Fixed all UTs following interrupted refactor