Merge "Unitests: remove conditions that are always true/false."