Move tests in basic/tests/ up one level preparating to multiple test dirs.