More resource testing and fixing a couple of issues