Removed TESTING macro and logic