Fixed remaining spec files