Fix null's on testing