Remove 'REQUIRES: LP64' from these tests and use a more targeted fix.