Removed unused macro.
Standardized braces style.
Split tests into units with helpers.
Merge pull request #1 from reem/cleanup

Code Cleanup