Fixed tests after removing bootstrap