Complete old tests