Add ui-boostrap, fix test errors, etc.