Some more queries..
Updated test cases
work in progress.
Added some more properties..need to get that reviewed