INT-2912 - Code Review
* Eliminate Spring Application Context for Test
* Improve SQL Query