+ Fixed SQL testcase
+ Cleaned up lot of changes