Use more variables instead of hardcoded names

Also general nicification
Add a test target

Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>