Removed unneeded code.
Changed data provider for test.