Shripad # Modified tests