Fixed all the tests with resources!