* edited to tests