Now properly testing each step of assembly
Re-organized tests into modules