cleanup and change some tests