Fixed even more old tests...