Refactored minifiers
Fixed tests on windows