Finally fixed the tests --Prabin