Added non-compile test file to trigger checks
Formatting
Lots of small changes. Added macros to clean comparisons
Push