Fix some accidentally disabled tests