Extended with AssertFailure macro

Extended Macros to include an AssertFailure macro which delivers file and line of the fail