Introduced TestScope, improved macros and comparisons