was started refactroing tests