Improve macros, fix tests and increment versions