Some more tests added