Fixed the original tests.
Fixed the original tests.