Fixed some minor test errors