jeremy fixed testing stuff