Replace catch_warnings with check_warnings when it makes sense.  Use assertRaises context manager to simplify some tests.