reorganized tests.  removed unused dependencies