fix tests, remove moq implementation