Fixes, now all tests truly pass, though the timeout is still needed