slight refactoring.
Adding SQL Parse test cases.
slight adjusts