Add catch tests
Add more catch tests