Add Macros, improve login page, rearrange tests.