Made a few changes in testing file