Apply coding standards for SimpleQuery and SimpleQueryTest
Add new simplequery testcases and support COUNT