Random hacking, a few tests pass once more