Improve tests as Service.equals() only tests Id
Remove unused resource method