Fixed up tests for other resources