Test fixes related to the Bootstrap3 migration