Modularized tests.
Added some basic data tests.