Some tests work now (at least they all don't fail anymore!)