Fixed issue #317

Conflicts:
	tests/CMakeLists.txt