Tests refactoring
Fix doc