Got rid of resource vector that was removed in newer code
Fixed tests to compile