fixes, update condition fix, moq, 5%