Edited some tests based on the required test scenario coverage