Enhancing formatter helper and tests
Adding tests for query helper and enhancing system under test