Implementation changed to use a TestSuite class. Macros removed.
Failing test included