Simplify development buildout according to changes in test base buildouts.