Minor fixes in unit tests