Anishek | Fixed some imports leading to failed tests and corrected 'test_addition_of_subject_with_invalid_uid_corrected' which started failing because of partial #2074 fix checked in earlier