Move more tests over to compare_static