Adding few more functional Tests