Fixed tests (except extension method - moq issue)