Made a couple of testing changes