Added rest of profile units as factories, added tests for opt in/out and loaded template with/without profileunits [MJ-374]