Add Connamacher's new tests
Get started rewriting this shit
Merge the old shit