Test: Minor fixes