Restoring original test and adding new test.