All tests passing on x64