Update stub tests. Change fabric test calling structure