Fix old tests