rectified some errors
modified tests
modified tests