Update conversion tests and test files