Implemented macro parser tests
Implemented Equals
Improved code coverage
Missing changes