Tests are nearly all working again.
Merge branch 'Wafle-Generate-D.TS' of https://github.com/ShamnaSkor/WafleProject into Wafle-Generate-D.TS