Add macro in tests
Test using and import
Merge branch 'master' into simn-haxe

Conflicts:
	build.sbt