Refactoring of makefile for tests, add signalswitcher