improve catchall tests