Subject: Makefile: Don't remove ert-tests

Description:
Merge branch 'master' of https://github.com/psachin/proxy-mode