Minor fixes
Fix tests