Unit test speedup
Reorganize code
Added primitive dep inj'er to Runner class