Anishek/Pooja | #2291 | Optimising tests in add_subject_tests