Fix Resource tests, were broken because of interface changes