Refactor tests
Remove coucdb dump
Refactoring