Added bootstrap and fixed specs