Update test rule in Makefile
Merge develop