Fixed tests related to new behaviour for exports (to allow for circular dependencies).
Fixed tests related to new behaviour for exports (to allow for circular dependencies).

hwinkler/amdclean,gfranko/amdclean