Rewrote test runner (for more flexibility). Added another nested 'if' expression into testing template