Add some more :catch related tests