Link cin_test against static lib.
Merge branch 'master' into testing

Conflicts:
	tests/Makefile