Add more tests
Split tests according to resource types