made updates to Testing structure and resolved defects PR 957