gustafn
committed
on 18 May 18
refactor testing code a little