Tests fixes
Fix #54