Remove some extern tests that don't work
Make things better