Remove base_test module and fix up missing deps