Fixing test-units execution