fix tests, macro-cursor