Changed version to 7.0-SNAPSHOT
Fixed some post-merge stuff
Fixed casing of TESTX for StressTest to match bitmag collection