Add Macro tests and first kind of working implementation (cannot select field)