[Test] Minor fixes