Minor fixes in test