Minor fixes
Update tests