Refactored data utilities with using of Q
Refactored database tests with using of Q
Refactored database tests with using of Q