Added original tests