Fixed some old tests