Finished getting testing suite to work again