Adding Testing support for submission PART 3