More tests fixed... almost done
Add catchpoint support