fix integration tests
fix unit tests
Merge pull request #491 from JahPowerBit/develop

Update tests