Started making skeleton for query interface and its tests