yet moar fixing of testing