Couple of changes

- Add support for CA bundles
- Add tests