Added last tests