Fixed tests after refactor