Reorg/rewrite with test runner scripts