Clean tests, change some method visibility