Removed unneeded tests.
Added validating data.