Fixed some spicy tests