Updated to fix test errors