PLD: consolidate formhub and main apps
PLD: remove formhub from tests