Add tests and fix Bootstrap support