Improvements.
Merged DataTester