added wheel and removed generation inside modules (now use x_test() instead)