Added multi assembly support & tests