fix integration tests
fix unit tests
skip contracts_test.py
change test ordering
Merge pull request #473 from JahPowerBit/develop

Update tests