Really fix error I reported as fixed

Also try to fix the tests but it segfaults