Rework macros to avoid duplication and allow more than one test-function on given system.