Tweaks build rules to fix tests.