Outdig5 complete and some test consolidation