Make ModularInput tests work again, need to refactor