Fixing some tests. [ci skip]