Removed some irrelevant integration tests.
Merge origin/master