Merge "tests: resources tests were not being run"