Improvements
Added HQL unit test