Implemented query args, fixed tests