Added more mid level modules, test bench