re-working for merge of junit runner