Skip tests that are broken, remove tests that are outmoded