Change tink_macros to tink_macro
Small update to LoopTest.  Some removed/commented, some added.

Still needs more testing