Added Testing support fixes