reorganizing unittests