Make modular input tests work from main test suite; nits