Adding few more tests