More and more tests added