Improve description
Fix tests by loading db when needed