Clean macros
Review view
Verify Test Units