Add original tests