#584 updated test results
#791 Added testcase
Merge remote-tracking branch 'origin/master' into addtests

Conflicts:
	tests/CMakeLists.txt