A few more tests added