Enable more test that were disabled and adjustment for emitter output