Fix some testing stuff