refactors tests: only parsed json gets tested
Merge branch 'dev' of https://github.com/SWTI2014/SWTI2014-Project-04 into dev

Conflicts:
	packages/SHC-Core.package/monticello.meta/version