fix for Makefile exports, adapt cmake export tests