Splice test code
Moving debugging macros to common file
Intermediate checkin