More tests / some fixes / removing refetch option