reorganise tests to make it easier to test the alternate bundle name
discovery parts