Added more tests
Changed import
Macros can't be used in the project itself