Reorganized macros.
Renamed test folders.
Made tests more independent.
Made imports fine-grained.