Got 9/10 test working again after rewrite
Fixed everything in core... now to deal with macro bugs.
ALL TESTS PASS