added more tests, resources