resolve tests conflict
Merge pull request #285 from JahPowerBit/testsuite

resolve tests conflict