Fix phantom tests
Fix up the rest