Update tests to use FileCheck