[x86] Clean up some tests to use FileCheck and combine two into a single