Modified tests with new changes