Fixed issue relating to macro tests getting wrong lambda-lists.