Did few changes in test classes