started testing and added queries