Fix Makefile wildcard for test code
Merge branch 'master' into Concurrix-network-simplex