The spec could be structured a bit better, but rewriting it from the old testsuite is a huge improvement already!