Add small fixes for bootstrap 3. Add tests.