r8936: merged classic-tests into tests