cleanup deps; split out test group