Started working on v2 tests + removed exceptions with macros