Added old tests again