Trying to restructure everything again... Beware existentials in the tests