Updated stubs and disabled testcases