Fix a test and convert more