Bunch of testing changes