Add more test
improve logging, no functional changes