Tests directory has own makefile
Merge remote-tracking branch 'upstream/master'