Update the modules macro

This commit improves the modules macro to avoid redundant information
in the test cases using such a macro.

Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>