Refactor to push fewer apps, remove duplicate tests