Add more setters and getters for SimpleQuery and more tests