Added grab & tests