Enhance some unit tests with the new resource count methods.