Returned previous changes so that command line version of tests works 100%
this breaks PyCharm UnitTests but is less of a problem in the long run